am 604c0371: am c63c6e97: am d06c435c: am c6c8a1e9: Merge "Increase the size...

am 604c0371: am c63c6e97: am d06c435c: am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in