Merge "bootstat: 3.18 kernel does not report "SysRq : Trigger a crash"" am: 5e2b2681ef
am: a2b4750771

Change-Id: Id6dc67787ae80e7ca043258cc7dd8e498f8fe0c5