Merge "Remove -Xint option from cts"