Revert "PA's hybrid engine"

This reverts commit b25dccb6e87d01ef2dab5fd0f1cf4ba22e0e32a4.

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