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

Change-Id: I44de0a3fe0bb99de3c70ef129f399fec69d2ffb5