put devices and kernels back in alphabetical order

Change-Id: Iafdd061b6404d56a3a87caba9000bfbfc4bc4a07