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

Merge commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a' into gingerbread-plus-aosp

* commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a':
  NDK sensor API