(cherry picked from commit 136976ef)

Conflicts:
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/bitmap4.cxx
	vcl/source/gdi/bitmapex.cxx

Change-Id: I9c3aeae76c155c9050404f67adeb91106502c3f1