am 7a4a9296: am fd5692b3: Merge "Stop polluting the namespace with...
am 7a4a9296: am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
* commit '7a4a9296':
Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.