Merge changes from topic "add_androidbp" am: 12b0627cc1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I159f7af28fc88bc74f8ce4058c37afd6e6a7d1fc