[automerger skipped] DO NOT MERGE remove development kernel config fragments am: 08ef68d1 -s ours am: 2f887a15 -s ours Change-Id: Ibad7d1b815c95fba26254ebbf78db2103d7ef496