Merge "Export libui_headers as vndk header library" into oc-mr1-dev
am: fdde1933ac

Change-Id: Ib5c9a780c257757d6272c44ccff87e26cb482c9a