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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70af03b180d8664e767ddbd37a72ee3d6737f827