Merge "Remove obsolete ANDROID_COMPILE_WITH_JACK"