Merge "Adding support for AIDL AudioControl HAL"