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

Change-Id: I0b76d8232df8a179d11caa5b10e73f4ff773fdc4