Merge "Change DalvikRunner to use newly added OptionParser."