Revert "Clean up ParcelableCompatCreatorHoneycombMR2." am: b959bc617c
am: 70294423a6

Change-Id: I571192c3f6d6afc6a26cfee3bf01826162f3eb9a