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

Change-Id: Id7de5e66472e77a94128d9eb28a3e26d1d3a1298