8974-common hosts and builds CameraWorkaround now

Change-Id: Ia1fa4bb401b46e6d13d4745ce6cd8d2481c021bb