Merge "Removed .aidl files that are not used on other.aidl files."