Merge "ART: Change CmdlineMain/Args behavior"
am: 86d244ec33

Change-Id: Id09b68c527679d9392da70f30781fe99392277ca