Merge "change kernel config naming convention"
am: f4fdfc325f

Change-Id: I4c9e0e3baa0ec27ecb9e74f4accff4e2d2b91790