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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61a048c1cdedd6bf5c446c08a5cca40f6c1dd332