Merge "Fix name of env variable in malloc_hooks README." am: 30144561a4
am: 5b518fea37

Change-Id: I37de8c48edb7a381fe762df8ada5c353854416d6