Android toolchain modified to build java targets