Merge "Accept the "-Xjitdisableopt" flag as advertised." into froyo