Fixing warnings due to initialization order

Not sure how this got missed, but the order we list these members does
not match the order the variables are declared in their structs. This
results in a warning, since they'll be initialized based on the
declaration order, which may be surprising. In this case, it should
not affect the program, since they variables are independent, but
fixing removes the warning.

Bug: NA
Test: m
Change-Id: I22ab007248ee71d74fcf1be7e95f1910bfdd3e38