Merge "Add --disable_vabc to ota_from_target_files help text."