Merge "libbase: add libbase_headers" into oc-dev