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

Change-Id: Ia3c4957499835edebb39b656fbe5e1e3beae8315