Merge "JniTest: Fix linker_namespace test for /vendor libraries" into oc-dev