Improved sorting of augmentations before code generation.

Change-Id: I6471f4849fa57a717d85d61293305b0853b851cb
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Merge "Improved sorting of augmentations before code generation."