Merge "Fix NE when DumpKernelStack" am: 1be5505422
am: dffa4fb974

Change-Id: If61b4d97a95f68655dd2841b3cc0d62dc26444ce