Merge "Add AIDL HAL server to audioserver.rc"