Merge "Make it easy to switch between scudo and jemalloc."
am: d120b8a06c

Change-Id: If2735209f3e8c701bc4349da8c127f8287fccefd