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

Change-Id: Ic2d8cc8e0d5441ad6476d04d7b5888dd574f3f5e