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

Change-Id: Id76e5c7d5db3c35402bd1ec3facf0748a90e184f