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