Merge commit 'e69204a02a9d2babd5352180fb541e7295db911a' * commit 'e69204a02a9d2babd5352180fb541e7295db911a': NDK sensor API