s4-common: Fix camera wrapper build for lollipop

Change-Id: I7bb182b5225f14c12f5de59a88e3905550810833