Merge "Remove the default java tasks and fix packaging java res"