Merge "Revert "Clean up ParcelableCompatCreatorHoneycombMR2."" into nyc-mr1-dev am: a669ab5fcb am: 9bd7e02178
am: cb22547255

Change-Id: If920df5bb37a1767da90c9eed8008a97252c510d