Fix up bitmap config check.

Instead of throwing away (otherwise valid) bitmaps if their config
doesn't fit any predefined one, convert them on the fly.

Change-Id: I2842a59fdc68f2f954c189ba6925eeeab33d4633