Merge "HwBinder: don't rely on kernel headers." am: b0e6033182
am: 1201b1b438

Change-Id: I6f83405794e747a505b75b6c4277e901e5ac6639