Merge changes from topic "add_androidbp" am: 12b0627cc1 am: 518ffcf2b7

Original change: https://android-review.googlesource.com/c/platform/external/oboe/+/1594982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ef2c34ef6ffd4a5012278248551888dbf45f989