Merge "Add flags needed to switch Jack to 1.8 for CTS targets" into nyc-dev am: 9c6827c017
am: 7c24d565b2

* commit '7c24d565b2edcb2111b8dbd75729496c351f7d5b':
  Add flags needed to switch Jack to 1.8 for CTS targets