Merge "Export libui_headers as vndk header only library" into oc-mr1-dev