Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates" into jb-dev