Merge "Fix warnings in system/media/camera."
am: 6ebfda2cbc

* commit '6ebfda2cbc67607cac6e39da03ed6fb421a087a3':
  Fix warnings in system/media/camera.