tree 7604facbaaa4cade64dc560b84e52da3aec52485
parent 0c29aabad25832ec249288c8da3cf080c898ba74
author Christopher Ferris <cferris@google.com> 1433449845 -0700
committer Christopher Ferris <cferris@google.com> 1433449845 -0700

Reorder DIR structure due to bad apps.

It turns out that apportable apps expect that the DIR structure is
the same as in L and below. Modify the structure to have the same
order, and move the new variable to the end of the structure.

Bug: 21037208
Change-Id: Id1258e9dc19423109a2c3a8086d3022965591166