Merge changes I166d5c7b,I15d5a2c2

* changes:
  Use soong_ui.bash instead of the deprecated make wrapper
  Stop using DIST_DIR directly, use dist-for-goals