Merge "Update debugging instructions." am: c2fc91e52b am: 64578d5b13 am: 2e7bc8ddec

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841374

Change-Id: Ic8d610948711f78d2297080ca0c1359c1a40e84f