Merge "Merge "Look for non-existent files listed in avb_vbmeta_args." into oc-dr1-dev am: 9c77abd6f2 am: f691e0a869" into oc-mr1-dev-plus-aosp