Merge "Remove generated java source post clean logic"