Merge commit '307aa79a' into gingerbread-plus-aosp * commit '307aa79a': Change Runtime.nativeLoad to return the dlerror(3) string.