Merge "Remove aidl wrappers for framework parcelables" am: 1a1396070e
am: 7cf43a2f53

Change-Id: I41a07768ec8d9af2b7f16d86ee074c206b153b0c