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

* commit '5fa0e1132e1052ce8248842ce42a8af0e1c0edb8':