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

Change-Id: I7403732f1a5c158b4bc18da58fc7fc46c91311fe