am a7dd66a4: am 9fa4b7af: Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev

* commit 'a7dd66a4709353cd27b4482be73d2b3804cbeaa6':
  Camera2Tests: create new directory for manual camera2 test apps