Merge "Use libaudioclient" am: 0a05c49248 am: 1d10b88f40
am: e327563c6c

Change-Id: I5a1868ae472821dbd3f29e342f7410f8adcb37d8