Merge "Stop passing DIST_DIR to Soong"