Merge "* Removed bitmapshaders from expectations/gm/ignored-tests.txt. * Rebaseline bitmapshaders, gpu didn't produce the same images when using only alpha bitmaps 	because it didn't consider the skpaint's color." into master-skia

https://skia.googlesource.com/skia/+/baa860c

Change-Id: I2820d9830cf763a7cb1601ca7055c8553388e35e