Merge "[aemu] Add missing includes that break clang canary" into main