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