Merge "Use buffered I/O during certificate parsing" into gingerbread