Merge "Stop using DIST_DIR directly, use dist-for-goals instead" am: a8f2601d28
am: 9b767e275e

Change-Id: I64a04f0c7b9220a8de872526ba37590b71fba458