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

* commit '50dc05e5add412b216ecd35b94f4f21decf98d44':
  Fix display list support for shapes.