Merge "change kernel config naming convention" am: f4fdfc325f am: 0564f4d6a9 am: 25b6255792
am: a156c4fdc6

Change-Id: Id7b51c88ac8698f7b58c7a815c0a19766baffc01