Merge "Fix build using ANDROID_COMPILE_WITH_JACK=false"