Merge "Rename callee save enumerators."
am: 066187de25

Change-Id: I3172a5e9dd37dc75746a0a63d4758558d0c00b7b