Merge commit '1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp * commit '1bece4320c1d2308b4a5b5aeda47b065312b3053': Make nativeLibraryDir visible in the API
Merge commit '1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp * commit '1bece4320c1d2308b4a5b5aeda47b065312b3053': Make nativeLibraryDir visible in the API