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

Change-Id: I247ffbd318bdd0ec8a0a3f9f6797518da0f50b50