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

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

Change-Id: I493c87bce2787a15bb8e29536ab662da60113778