Merge "AIDEGen: Adds class XML generator" am: d69477698a am: b96b5798ab

Change-Id: Ic470b029b6fe71dec0ec1a25a2b82a4fc443c0da