Merge "cts: android.kernel.config drop v2"