Merge "libaudiohw_legacy needs libaudioclient_headers" am: 97a11597b6
am: 00eef5e988

Change-Id: If0ccfec8730ed0fbe414575681bbb36932a6b827