Remove the dependency on CameraHolder.

Change-Id: I39882f1bf2a4cd730d00ceabc7705692bcee6bc0
12 files changed