diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
index a08f183..1443458 100644
--- a/src/gyp/common.gypi
+++ b/src/gyp/common.gypi
@@ -360,6 +360,8 @@
               ['_toolset=="target"', {
                 'defines': [
                   'OS_ANDROID',
+                  # For the ambiguity of wcsstr.
+                  '_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_',
                   'MOZC_ANDROID_APPLICATION_ID="<(android_application_id)"',
                 ],
                 'cflags': [
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 0159980..6fa2a73 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2029
+BUILD=2030
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.