am 012326fb: am b3b088e6: Merge "pixelflinger: make self-contained"

* commit '012326fbe97d8d1570ab4521e697415bb6691c4a':
  pixelflinger: make self-contained