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

Change-Id: I9634659771d59eabe4294a8df5cbbd4bd1181978