am c6a0944c: Merge "Fix display list support for shapes." into honeycomb

* commit 'c6a0944c80b3a9bcea00ce9b5d3a605eaadabb49':
  Fix display list support for shapes.