am cda0c61d: am 14d6be45: Merge "Delete non-uapi headers."

* commit 'cda0c61dc7490236afb697ac50c900cffe2cb640':
  Delete non-uapi headers.