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

Change-Id: I8f91dbe5d01982952b10999dbdd30e6b706a1bb7