Merge "Use libaudioclient" am: 0a05c49248 am: 1d10b88f40 am: e327563c6c
am: 694d1b5764  -s ours

Change-Id: I808bf0d575a3b6a8088fd03fa8fcb43f7084602f