Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev