Backout 977d6be3df40 Bug 957450 - The added "or condition" didn't prevent gonk-kk version fall into non-const definition.

memory/build/malloc_decls.h

@@ -15,7 +15,7 @@
 
 #  include "jemalloc_types.h"
 
-#  if defined(__linux__) || (defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19))
+#  ifdef __linux__
 typedef void * usable_ptr_t;
 #  else
 typedef const void * usable_ptr_t;

memory/mozjemalloc/jemalloc.c

@@ -6548,7 +6548,7 @@ malloc_good_size_impl(size_t size)
 }
 
 
-#if defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19)
+#ifdef MOZ_MEMORY_ANDROID
 MOZ_MEMORY_API size_t
 malloc_usable_size_impl(void *ptr)
 #else