am b9258b57: am d090054d: Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev

* commit 'b9258b57aa0c86e4741e2c24474bb9d766d17e8e':
  Fix ProCameraTests to pass on Wolfie, disabling failing tests