Merge "Cleanup crtend names."
am: f01c0a5b40

Change-Id: I16f682ca0c26b803ace0ab686b9c9116591ed92d