Merge "kernel.config: aslr test exception in std:stoll"
am: 55f50c6a4c

Change-Id: Ia46be19245b3d9cfd8fa117614fc0a957cd63bbd