Merge "Conditionalize VM console arg based on arch"