Merge "Don't look for libnpt.so in java.library.path." am: bdf22a2da2 am: b791271b74
am: 6241951371

Change-Id: I6ddbc4438bcfa5a4b3b6c3a26664fc4d6e73cc0f