Merge changes I07c122d5,I977fdb7b into jb-mr1-dev

* changes:
  Camera: Add test for enableShutterSound
  Cts Verifier: Use new android.hardware.camera.any feature.