Camera2 Tests: Add multiple stream tests

Add a test to test multiple stream configuration: one preview stream, one small
size YUV burst capture stream, and one large size YUV burst capture stream.

Also cleanup the code.

Bug 10325342

Change-Id: I676484cc0034055caa8f2a8788100ed34b4cefbb
diff --git a/tests/camera2/Android.mk b/tests/camera2/Android.mk
index 8f2278a..9efac0f 100644
--- a/tests/camera2/Android.mk
+++ b/tests/camera2/Android.mk
@@ -10,6 +10,7 @@
 	CameraStreamTests.cpp \
 	CameraFrameTests.cpp \
 	CameraBurstTests.cpp \
+	CameraMultiStreamTests.cpp\
 	ForkedTests.cpp \
 	TestForkerEventListener.cpp \
 	TestSettings.cpp \