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

Change-Id: I3e13058063f154880183a6aa30535e08e3e1b26c