Bug 515492: Revert some bogus changes for hopefully the last android build bustage fix.

browser/installer/package-manifest.in

@@ -67,6 +67,8 @@
 #ifdef WIN32_OLD_STYLE_JEMALLOC
 @BINPATH@/mozcrt19.dll
 @BINPATH@/mozcpp19.dll
+#else
+@BINPATH@/jemalloc.dll
 #endif
 #endif
 #else

memory/mozalloc/mozalloc.cpp

@@ -85,9 +85,7 @@
 #define free(a)       je_free(a)
 #define strdup(a)     je_strdup(a)
 #define strndup(a, b) je_strndup(a, b)
-#define memalign(a, b) je_memalign(a, b)
 #define posix_memalign(a, b, c)  je_posix_memalign(a, b, c)
-#define malloc_usable_size(a) je_malloc_usable_size(a)
 #endif
 
 void