Merge "Allow specifying vbmeta/parts via fstab"
am: 41216e591b

Change-Id: I7459b96ff84e9cbff0ef76a2d10882aea4532c38