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

Change-Id: Ia62e125dfdccaaff258f3a6aa01ec3fbdc24902b