Merge "Add command line parser for simulator" am: 7965a95adc
am: 94bc9e1010

Change-Id: I563cd91537d42c20660a3f04907fea06a8c1fcb7