Merge "Remove aidl wrappers for framework parcelables"