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

Change-Id: Ibc2f55904f5a9ae4d1f2d2dde9668f6de3c61403