Merge "Fix -Xint and -Xusejit interaction" into nyc-dev