Merge "Frameworks: Slightly refactor Parcel code" am: 9d519d808f
am: 308b11e264

Change-Id: Ia7de39803f1f7aacb6fbb9c16ce6f0ca163faf65