am 7bda5aac: am d12ee620: Merge "Re-enable uapi kernel headers for arm."
am 7bda5aac: am d12ee620: Merge "Re-enable uapi kernel headers for arm."

* commit '7bda5aacb1fdb765e2073c00da396bd93db531e5':
  Re-enable uapi kernel headers for arm.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build