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

Change-Id: If06abb693de9a7163a3d06946229123e20e519e7