Merge "Change jack/dex target dependency to jack script"