Merge "Copy common.csv and diff.csv into DIST_DIR" am: 9ec7872720 am: 9f15bde9a7
am: 82dcae1912

Change-Id: I881d8d5db55feaf1c7a589e136e9943b5431b9af