Merge "libaaudio: remove unused deps" am: 10b5ef5d18
am: 24225f9ba0

Change-Id: I534a9d6ad4b9988946811f85508be2089077b836