Merge "Revert "Fix: vendor public libraries are accessible via System.loadLibrary""