Merge "binder: bpfix bp files" am: ea18143b0d am: f420ff9f18 am: 84f71389cc
am: 24e2f5f21f

Change-Id: I9478535858c8425b628edd4266f2a30ce002a819