Merge "Clean up options for ART runtime."