am e5e78ccb: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e5e78ccb':
  Restore the ability to track native Surface changes Bug #8230990
  Support 3D rotations when drawing text
  Account for text alignment in Op bounds calculation
  fix issue when replacement bitmap is larger than original.
  Revert ActivityManager changes for tasks. DO NOT MERGE
  Revert "Fix ListView is not scrolled properly with arrows"
  Update histories simultaneously.
  Revert "Update histories simultaneously."
  Update histories simultaneously.
  Add null check to setAppGroupId.
  Fix crashing bug in validator.
  Switch topRunning* and moveTaskTo*
  Trying to unregister a semi connected accessibility service.
  Begin switch over to task based history.
  Switch to system process before modifying rotation.