Merge "ART: Change CmdlineMain/Args behavior"