Merge "first-stage mount: support using other avb_keys"