Merge changes Ie07aa647,Ibdc355b1

* changes:
  Revert "Temporary hack: Boot protected VMs without pVM firmware."
  Update pvmfw.img

.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb

@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "8134799"
+    build_id: "8149267"
     target: "u-boot_pvmfw"
     source_file: "pvmfw.img"
   }

virtualizationservice/src/crosvm.rs

@@ -271,8 +271,7 @@ fn run_vm(config: CrosvmConfig) -> Result<SharedChild, Error> {
         .arg(config.cid.to_string());
 
     if config.protected {
-        // TODO: Go back to "--protected-vm" once pVM firmware is fixed.
-        command.arg("--protected-vm-without-firmware");
+        command.arg("--protected-vm");
     }
 
     if let Some(memory_mib) = config.memory_mib {