[automerger skipped] Merge "Revert "Fix: vendor public libraries are accessible via System.loadLibrary"" am: 69f11ef333 -s ours am: f86a72cbd8 -s ours am: ca61da8141 -s ours
am: 383ec7f484 -s ours
am skip reason: change_id I1970eba7e732728699042a36b89571915ec81451 with SHA1 9c7d8b12b4 is in history

Change-Id: I6dba7319638212b937bedaacfd14f3a41dc8159e