Also fix sort order in couple of files. Bug: http://b/26475271 Change-Id: I75775ded99edd313e9ea31f0b3b4de03096be482