Merge "Skip vbmeta_system if it doesn't exist"