Merge changes I2d41cb94,Ia1a17985

* changes:
  fix [2324665] texture leak in surfaceflinger when using camera
  fix a texture leak introduced recently.