Merge changes I62db2bc4,I20f13fd3 into main

* changes:
  Make libnativewindow_rs be available to the virt APEX
  Export surface::Surface as Surface