Fix order of entries in thermal-engine-8226

Change-Id: Idcef6bff14a0b36591d7bbb40e5306c4cd316a73
Merge branch 'cm-11.0' into martincz