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

Change-Id: I63d04b2217a98a1344529e7089e65542c448b893