Fix Heap::UnBindBitmaps for spaces without bitmaps am: 7c502740ba
am: de6f202230

Change-Id: I3fab46251888728602c4fe554a77dbdc2f3f4f3d