Merge "Add more build variants to audio_common-aidl"