am a8ebe8b3: am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo