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

Change-Id: I4c83b9c53ae26167696d0aa8114d481a8581848f