Add camera workaround

Change-Id: I53dac013b155936691ebc889fe72a728a7e64b91
Fix vendorsetup error

Change-Id: I92a9540426c45b0c4870883225be32ffe6827163