Merge "Adding AIDL version 2 of AudioControl HAL"