Merge "Export DIST_DIR to soong on dist builds." am: 824958e880 am: 26f40c264d
am: 8add887830

Change-Id: Icb82ea0d52abcd02bebb6a56c22ca16286aaa0ba