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

Change-Id: I7dcb2233d017cc438c53992c14e32d390beca722