Merge change 25162 into eclair

* changes:
  Build the BitmapShader if it hasn't been built yet.