Merge changes from topic "binder-primitive-array" am: d88ac7f787 am: 3466efff36
am: 595549ee3b

Change-Id: Iea7b8c8cd2247e1cb017d50b98669e613f75a13f