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

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