Temp until I fix camerahal

Change-Id: Ic4cc9a16a83a0eb80234a32e7020af6749f9a895