Merge "Unify target and host Java compilation"