Android 6.0.0 release 41
Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev