am 3f13e2fa: am 021efd1b: Merge "pixelflinger: make self-contained"

* commit '3f13e2fa3eaecc2571159cb4e3cc7dd28d2d536e':
  pixelflinger: make self-contained