Adapting CM 10 camera hack to more files

Change-Id: Ia8ece18c01e3f80c1b03aeb0982ffb8c9c92f152