Merge "[AChoreographer] Consolidate AChoreographer source files"