Merge "Update to remove direct include of jemalloc_new."
am: 0e0b473a4c

Change-Id: Ib4715cc140a73413bcfa172cf4e42e9f90265c97