Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev am: bc907cf9a8
am: 11e0e33756

Change-Id: Ifcb92445f6e8cda2a2c9eb4350be65937ea5787b