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

Change-Id: I577cfe4e8426f927e5ab9f6ca640889e88f09f4c