sensorfw: Bump SRCREV and adapt new hybrisadaptators for OE build

recipes-nemomobile/sensorfw/sensorfw_git.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SRC_URI = "git://git.merproject.org/mer-core/sensorfw.git;protocol=https \
            file://sensorfwd.service"
-SRCREV = "9efd97d298131a116e4e93fa223072def9268e81"
+SRCREV = "bcdff5b18a1f5d5a28533a2201c9b357a613bb53"
 PR = "r1"
 PV = "+git${SRCPV}"
 S = "${WORKDIR}/git"
@@ -14,7 +14,8 @@ inherit qmake5
 
 do_configure_prepend() {
     sed -i '/include( doc\/doc.pri )/d' ../git/sensorfw.pro
-    sed -i 's@=/usr/include/android@=${STAGING_DIR_TARGET}/usr/include/android@' ../git/core/hybris.pro ../git/config.tests/hybris/hybris.pro ../git/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro ../git/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro ../git/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro ../git/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro ../git/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro ../git/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro
+    sed -i 's@=/usr/include/android@=${STAGING_DIR_TARGET}/usr/include/android@' ../git/core/hybris.pro ../git/config.tests/hybris/hybris.pro ../git/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro ../git/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro ../git/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro ../git/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro ../git/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro ../git/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro ../git/adaptors/hybrispressureadaptor/hybrispressureadaptor.pro ../git/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.pro
+
     sed -i 's:-L/usr/lib ::' ../git/core/hybris.pro
 }