Merge "Export DIST_DIR to soong on dist builds."