Merge "Delete non-uapi headers."