Reorder Makefile entries from r316945
PR: 176049 Reported by: Oliver Pinter MFC after: 3 weeks X-MFC-With: 316945