diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index 061e9ab7a..7cf00a778 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -107,11 +107,11 @@ extern "C" {
 #define HAS_H422TOARGBROW_SSSE3
 #define HAS_I400TOARGBROW_SSE2
 #define HAS_I411TOARGBROW_SSSE3
-
+#if !(defined(_DEBUG) && defined(__i386__))
 // TODO(fbarchard): fix build error on android_full_debug=1
 // https://code.google.com/p/libyuv/issues/detail?id=517
-// #define HAS_I422ALPHATOARGBROW_SSSE3
-
+#define HAS_I422ALPHATOARGBROW_SSSE3
+#endif
 #define HAS_I422TOABGRROW_SSSE3
 #define HAS_I422TOARGB1555ROW_SSSE3
 #define HAS_I422TOARGB4444ROW_SSSE3
@@ -202,11 +202,11 @@ extern "C" {
 #define HAS_H422TOABGRROW_AVX2
 #define HAS_H422TOARGBROW_AVX2
 #define HAS_I400TOARGBROW_AVX2
-
+#if !(defined(_DEBUG) && defined(__i386__))
 // TODO(fbarchard): fix build error on android_full_debug=1
 // https://code.google.com/p/libyuv/issues/detail?id=517
-// #define HAS_I422ALPHATOARGBROW_AVX2
-
+#define HAS_I422ALPHATOARGBROW_AVX2
+#endif
 #define HAS_I422TOABGRROW_AVX2
 #define HAS_I422TOARGBROW_AVX2
 #define HAS_I422TOBGRAROW_AVX2