Merge "libbinder: Remove unused type: small_flat_data" am: a9ed1a6486 am: bc28462b5a
am: af0435dc8f

Change-Id: Ic48268e3f0f5a0cdc750b133e7c9b16d61fe4776