Merge "Change bitreader to use a larger window."