Merge "Fix broke NDK sensor manager API" into mnc-dev