m7-common: Fix camera compilation for lollipop

Change-Id: I14fa14b2730fc801aaed44829b94e4d6dc71ba59