am 41287f17: Merge "Revert "pixelflinger: make self-contained""

* commit '41287f17276934cf3206ef6414f473e697f3e82f':
  Revert "pixelflinger: make self-contained"