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

* commit 'd93a7a945181dda99a8c4355e61b939542a5da3a':
  Remove obsolete ANDROID_COMPILE_WITH_JACK

Change-Id: I0d7c7389b32a4480bf7076f0759572dc65f715cb