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