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

Merge commit 'e68362e1d65546b17ad0cad2b6598328f40aec57'

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