Merge "Rename vbmeta_mainline to vbmeta_system."
am: da915b4af3

Change-Id: I679c75534382705a734a5a8618b9ee4ebe90f220