Fix BufferedReader.readLine to not read ahead after '\r'.

Bug: 8778372
Change-Id: I789d0ff5498cca48b16bb7b3b363014f7b6bcf95