Merge "Add the basic config to run through atest"
am: dc738093fe

Change-Id: Ib17a09268aaee034d113f04aa63f6abc7a0a5ad1