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
(cherry picked from commit 5edb0f40f654c804d38f1bff43f91719e189c892)
Change-Id: I0c1ab5e295ec8bef638daa4cfea5830aeea602e6