am cb1bdc9e: (-s ours) am c91612d4: Merge "remove pixelflinger from recovery"

* commit 'cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f':
  remove pixelflinger from recovery