Merge "Export some api files for use by cts/tests/signature tests"