Apply the Makefile sorting fix generated by sort-makefile-lines.py. (cherry picked from commit ef7f4b1f)
