Merge changes Ifd855e5e,Ia370469b

* changes:
  goldfish-opengl: nuke HostVisibleMemoryVirtualizationInfo
  goldfish-opengl: nuke un-compiled line