Merge "Add flags needed to switch Jack to 1.8 for CTS targets" am: b97cfe80...
Merge "Add flags needed to switch Jack to 1.8 for CTS targets" am: b97cfe80 am: e3ced5b6 -s ours
am: fcd44f9b
* commit 'fcd44f9b':
Add flags needed to switch Jack to 1.8 for CTS targets