PA's hybrid engine (Resolve conflict?)

Change-Id: I1aef85f92c67019045d0fd3322a0b529168d9d9f

Conflicts:

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