am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev

* commit '5ce25d717059c9c37618aa349314077f99ac34c7':
  NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound