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

Change-Id: I55ad06914aae308f7ffa46c27b9bab3db46cdc1c