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

Change-Id: I8793485f3211e834d6461531ae1b374c9c8d03f5