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

Change-Id: Ie6a578da0eb655f34b0576d1be53db110c696b71