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

* commit '9c6827c017e64c3ea4e9f0c9a4b33fba4363304c':
  Add flags needed to switch Jack to 1.8 for CTS targets