Merge "Sensor related changes for NDK." into lmp-dev