am ff966d5f: Merge change I5235cf3f into eclair

Merge commit 'ff966d5f6c88a9fba033f1bb5ec087464376534d' into eclair-plus-aosp

* commit 'ff966d5f6c88a9fba033f1bb5ec087464376534d':
  Fix but processing raster state pragma.