Merge "Use argparse in merge_csv.py." am: 28207235fd

Change-Id: I3281b352b359d1bc962ded7e9664fe20c57478cb