Merge "Revert "Clean up ParcelableCompatCreatorHoneycombMR2."" into nyc-mr1-dev