Merge changes from topic 'Bug 19769719'

* changes:
  stagefright: Rename mBuf to mSlot
  camera: Rename mBuf to mSlot