Merge changes I2ae26513,Iddf3993c,I94bc5994

* changes:
  Relocate libc++ libraries to keep Soong happy.
  Updates for update.py.
  Update script to work on off-corp machines.