Update x20 paths + more debugging data

Change-Id: I1a2ab7ad183b6310eebedc91a9504a612bd39240
2 files changed