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

Change-Id: Ife6aa5bba35b7f973933979b721da779a9d78541