Upgrade AspectJ to version 1.8.4