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

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

Change-Id: I8f1139b2558feadce2d0a25dab9e27f234a06acb