Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	services/java/com/android/server/am/ActivityStack.java