am e69204a0: am 36ff93aa: Merge "NDK sensor API" into gingerbread

Merge commit 'e69204a02a9d2babd5352180fb541e7295db911a'

* commit 'e69204a02a9d2babd5352180fb541e7295db911a':
  NDK sensor API