Merge "Fix implicit sign casts in Parcel.h" am: 9984fa0ed0 am: 4901e7c070
am: 7600934e17

Change-Id: I40be1101c9bd1cb77571e1c26ac8000e96293232