Merge "Clean up libaudioclient includes" am: c26431a95d am: 6775ee2b2c
am: 2dcf28a6d4

Change-Id: I3729bdca2c42f5e32ba4e4624e5598bf09389980