Merge "libaudioHAL: reduce version specific code"