Merge "Cleanup crtend names." am: f01c0a5b40
am: abe3f17461

Change-Id: I94291eb088c19a6ec9e8a356c0daa582e8fad035