Merge "Clean up options for ART runtime." am: 5c517f5ae9 am: 94754ea0e7

Change-Id: I59be9bf44a85e128b209e5373333fe29805d841d