Change order of modules to spec.

  Bug: 12607061

Change-Id: Iff142b2571f17f71f7a76d629119ac4c8c7f2764
2 files changed