[misc] Update clirr setup because of AspectJ hacks