t0lte: Fix mismerge after adding Camera Wrapper



Change-Id: I82d8549c48bf0c8b0912a611c4ddf7b828a0288a
Signed-off-by: doc <doc.divxm@gmail.com>