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

Change-Id: Ibb10d1b3320f168aa88ba03de9a515c591ae8940