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

Change-Id: I4dccc766c6f7954624a86ff00bb7f5be3c70dd7a