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

* commit '14d6be45b960f8fbb039bd946e22ce406e8b65c3':
  Delete non-uapi headers.