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

Change-Id: Ifd03efb565c532f7c18455d85a187229f4bbc8e3