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

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

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