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

Change-Id: Ia9c551c7648678010b62d206a4b7363b8c229043