Merge commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e' into gingerbread-plus-aosp * commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e': Copy over updated NDK APIs and follow other API changes.
Merge commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e' into gingerbread-plus-aosp * commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e': Copy over updated NDK APIs and follow other API changes.