Merge commit '8b11f30cb2cfe9922439e8a032311de114ce4da4' * commit '8b11f30cb2cfe9922439e8a032311de114ce4da4': Make nativeLibraryDir visible in the API
Merge commit '8b11f30cb2cfe9922439e8a032311de114ce4da4' * commit '8b11f30cb2cfe9922439e8a032311de114ce4da4': Make nativeLibraryDir visible in the API