CameraWrapper: add HTC camera switch

Conflicts:

	camera/Android.mk