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