Merge changes Ie07aa647,Ibdc355b1

* changes:
  Revert "Temporary hack: Boot protected VMs without pVM firmware."
  Update pvmfw.img
diff --git a/tests/aidl/Android.bp b/tests/aidl/Android.bp
index a2315ce..893ec0b 100644
--- a/tests/aidl/Android.bp
+++ b/tests/aidl/Android.bp
@@ -9,7 +9,7 @@
     backend: {
         java: {
             platform_apis: true,
-            require_rpc: true,
+            gen_rpc: true,
         },
         cpp: {
             enabled: true,