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

* commit '7b39059ca68ab44b1922ca48de59c516f024abbc':
  Revert "pixelflinger: make self-contained"