Merge changes Iad6d2e5b,Ib4b6b9bd,Ic50d0d38 into master-cuttlefish-testing

* changes:
  Merge aosp/master into master-cuttlefish-testing
  Revert "vsoc_x86_64 also has "overriding commands" warnings on master"
  Configure NeuralNetworks HAL default drivers for cuttlefish
diff --git a/host_package.mk b/host_package.mk
index 67df674..a3f482e 100644
--- a/host_package.mk
+++ b/host_package.mk
@@ -64,6 +64,7 @@
     libicuuc-host \
     libicui18n-host \
     libandroidicu-host \
+    libopus \
     libvirglrenderer_cuttlefish \
     libEGL_swiftshader \
     libGLESv1_CM_swiftshader \