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