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

Change-Id: Ib69a20153754018c951f504b5f14e91074526144