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

Change-Id: If4cf33b6f71a8abcee63533a69467debdf443c68