[automerger skipped] Merge "Add stubs so you can use libaaudio from an APEX" am: 2bb0404ebc am: 11060fbe35 -s ours
am skip reason: Change-Id I1350a8e110f5ffc6e1f8316c46a36b8a50b73fb6 with SHA-1 99c47ff165 is in history

Change-Id: If8a8cbaafef20d8a75d5a3826b8bfb103f944790