Merge remote-tracking branch 'github/cm-11.0' into HEAD

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

Change-Id: I13627327fc847c580db608fa7dc1d12dbb4fcd52