Merge "binder: bpfix bp files"
am: ea18143b0d

Change-Id: Ic9e177427d29da45d939d8d379b792f5ffb428c1