Android o preview 3
Merge "Add test config to JniInvocation_test"
am: 7e7c5b9a8b

Change-Id: I666833e74f70fb39e946f932b733eae2432c5d1e