am 32838ef8: am 02cb925c: Merge "Stop abusing KERNEL_HEADERS."

* commit '32838ef838d1341aa8b77022869b801fb0bbb26c':