tree 0b5f9f0ab495f34097724df6c7c771e6264b2700
parent c61622fc65712437e52fa9ba3ff0ca0eee8808d3
parent b668dca8fd87d4fba6786e6f167296902cb28e90
author Haibo Huang <hhb@google.com> 1614759047 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614759047 +0000

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