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

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