Merge "Try to avoid possible NPE" into jb-mr1-dev

services/java/com/android/server/pm/PackageManagerService.java

@@ -4110,7 +4110,7 @@ public class PackageManagerService extends IPackageManager.Stub {
                     }
                 } else if (!isForwardLocked(pkg) && !isExternal(pkg)) {
                     // Update native library dir if it starts with /data/data
-                    if (nativeLibraryDir.getParent().startsWith(dataPathString)) {
+                    if (nativeLibraryDir.getPath().startsWith(dataPathString)) {
                         setInternalAppNativeLibraryPath(pkg, pkgSetting);
                         nativeLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir);
                     }