Reorder vendor/metadata partitions
am: 17c19e8420

Change-Id: I941484129d7f7f0eec94b9a9a0674192215f2a7b