Fix typo, actually build CameraWorkaround

Change-Id: I3d89ab58201ef261506cd5f70deb4d54e8bc5482
Merge branch 'cm-11.0' into kk_mkt