Merge "Clean up libaudioclient includes"
am: c26431a95d

Change-Id: Ib29964380ae94758a5c98e3bd8399c470a32eb27