Revert "someone left stash headers in sensor viewer"

This reverts commit cf011f32e5ad5f6ad74c995ce0573dcb2e5f2f1b.
Revert "Revert "Added guards for Android builds.""

This reverts commit c74c78a3b4860ada562ecde071b2efc89c5480b7.
Revert "testing additional parameters"

This reverts commit 6019d27142203caf003b901df1ca146aeea0e154.

Conflicts:
	HAL/Camera/Drivers/OpenCV/OpenCVFactory.cpp
testing