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

Change-Id: I022e2854b4282034b409aa9f19470b42301cb17f