Merge "Remove obsolete ANDROID_COMPILE_WITH_JACK" am: 835e023
am: d07afb5

* commit 'd07afb559168765ee1fbb24f33314dfd329f3db9':
  Remove obsolete ANDROID_COMPILE_WITH_JACK

Change-Id: If47a28193709bc6ce41e35e76b1a7923bcc08fec