Remove usage of hidden Parcel APIs am: 2f45d6dcc0

Change-Id: I4221b37489c70e6f9b0b5750de396a0d25c8bf67