Merge changes Ic07050a8,Idae22d9e

* changes:
  Update build-tools to ab/8162587
  Add musl sysroot to update-prebuilts.sh