Merge "fastboot: Add vbmeta_mainline to the partition list." am: d800caf345
am: 0f863e101a

Change-Id: Ie8b559cfc7f80511e3974380539ecf7566765ae5