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

Change-Id: I06280a10a963f30f1bca97067130656a09433001