am 7fd5c53c: Merge "Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797" into klp-dev

* commit '7fd5c53c4507995da1e1f1300a2f9def30bffce8':
  Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797