Merge "Remove extra definition of AIDL"