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

Change-Id: Ia51be698df36453e944b64c18bbfd9977c988fcd