Merge "Don't crash with non-standard bitmap types." into honeycomb