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

Change-Id: Ifcc90e269e8cd00353457907159c2a2887a1688a