Merge "Update error codes for AAF API" into beijing

No match.