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

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