gps: update overridden header for lollipop

Change-Id: I453d97807c27d498d6eb9fcae09f7852a3221354
dlx: Fix camera compilation for lollipop

Change-Id: I5b17031aa5fcdf1fb9bfe52d46108529c3cde1f1

Conflicts:

	camera/CameraWrapper.cpp