Merge "Annotate java.io.PrintWriter." into pi-dev