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

Change-Id: I55ed13a69d1c05fccb233b4843497dc97d140ea4