Merge "Add ARIA subtree to build"