Merge "Remove explicit 8192 arguments to BufferedReader and friends." into dalvik-dev