am 5dd7c726: Merge change 26667 into eclair

Merge commit '5dd7c726f45fd7b7ab473471dc504c00012a6856' into eclair-plus-aosp

* commit '5dd7c726f45fd7b7ab473471dc504c00012a6856':
  Add raster object to control point and line params. Add flag to force SW rendering.