Merge "binder: bpfix bp files"