Merge "Rename vbmeta_mainline to vbmeta_system." am: da915b4af3 am: 0c203aedd7
am: 52adbb24ef

Change-Id: I1a9a29bce50cd932f5db1bc91a0f94231db6fe41