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

Change-Id: I5ef079d0cb35b79acccc469bf613cdf563b9b9b2