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

Change-Id: Ic291dbf2eb8d6244b883c696756183ace21cfa46