Merge "Try to locate symbols using build-id." am: b0f82fbc61 am: 065fb2f219

Original change: https://android-review.googlesource.com/c/platform/development/+/1873614

Change-Id: I37c880458856bf5a403ed68d1f837d41ca6c035f