Merge remote-tracking branch 'x86/pie-x86' into q-x86

diff --cc android/build.mk
index c09c1da,585252e..a2b9bd4
--- 1/android/build.mk
--- 2/android/build.mk
+++ b/android/build.mk
@@@ -65,9 -65,8 +65,9 @@@ LOCAL_CFLAGS += 
        -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -Wno-unused-parameter \
        -Wno-deprecated-declarations -Wno-missing-field-initializers -Wno-sign-compare \
        -Wno-constant-conversion -Wno-incompatible-pointer-types-discards-qualifiers \
-       -Wno-initializer-overrides -Wno-sometimes-uninitialized \
+       -Wno-initializer-overrides -Wno-sometimes-uninitialized -Wno-string-plus-int \
        -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-absolute-value \
 +      -Wno-expansion-to-defined -Wno-string-plus-int \
        -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes \
        -Werror=return-type -Werror=vla -Wformat -Wno-maybe-uninitialized -fPIC