Merge "Always use non-sanitized library locations for JNI."
am: bbf833c7e1

Change-Id: I3c26812c7799f2757e642ca4c7a4a4a12d7c3449