am ad7205fc: am f1b73aad: am 2f23c58a: am 73678112: am 56494859: Merge "Camera: reduce number of buffers allocated in PerformanceTest" into mnc-dev

* commit 'ad7205fc2a67ef0fa8e77b1575b3447c7f17eff5':
  Camera: reduce number of buffers allocated in PerformanceTest