Merge "Fix broken target SDK checks." into pi-dev

diff --cc core/java/android/content/pm/PackageParser.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/notification/NotificationManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge