Fix building with GCC 4.7

Change-Id: I8981c83a4ffb83b2d00208c1ad0a05a33cb7bb33
Fix camera

Change-Id: I32112985aeeac7d4be884593fd30ed9ffa2d20d7