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

Change-Id: I7e3547d2108a4ea1d3a0a2a82d2e6dd86827c5d7