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

* commit '25bf9d953edbafc823487340bd13a712052d9e8e':
  Fix warnings in system/media/camera.