Merge "Use PR_SET_VMA_ANON_NAME to name the abort message mapping." am: 14025fd2bf
am: 04b0178166

Change-Id: Ice9d7517cad46476c0d331065946d6ebdd3ab2ca