Merge "Fix: vendor public libraries are accessible via System.loadLibrary" into pi-dev am: c4b6bd34e1
am: 0221eaa392

Change-Id: I20f644dbafb96955e96f22ecef61292ffeae9e7f