Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928
am: b5d6cc540c

Change-Id: If5179d1403e99ac2008cfeb89046eb486263817c