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

Change-Id: Iedd8d7e9ef654de0a86df2d224393287df0e8514