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

Change-Id: I94ec09556390335ccf5379feffcd841bd7d3d802