am 4ce930da: am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread

Merge commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea'

* commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash