Merge "Camera: fix various VTS issues" into oc-dr1-dev
am: 5311547c05

Change-Id: I6f84ecdc15b1c3dcb719961aeabfeae0603c4eb2