Merge "cts: android.kernel.config drop v2" am: edb18846b8 am: 377daa8c61
am: e2cd91046a

Change-Id: I65f4957e3ad7c29afeffaf297fda2ec1ab399af0