am 2e9b39e4: Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread

Merge commit '2e9b39e457f1cf6794356144cad250c7fbe4e868' into gingerbread-plus-aosp

* commit '2e9b39e457f1cf6794356144cad250c7fbe4e868':
  ndk: Add missing OpenSLES headers and libraries.