Merge "Add flags needed to switch Jack to 1.8 for CTS targets"