Merge "Stop relying on kernel binder headers." am: 8f82e1240f am: b358d73c43 am: 86071b334c
am: 53dc67599a

Change-Id: I47afd5e83bb2ebfaec1eed19c06b1b14da225687