Merge "IAudioPolicyService is now in libaudioclient instead of libmedia"
am: 76f97250ff

Change-Id: Ie85b93bdb1b0b004c4cfe9cd2f60cc8766781ced