Merge "Merge commit \'1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f\' into manual_merge_1a510a3" into nyc-dev-plus-aosp
am: e7965d4

* commit 'e7965d4a22492a947462c62b99e8db9f41d497ff':
  Remove support of disabling Jack.

Change-Id: I067b7f2d3290948e3fcf656a596645f804a3803b