Merge "Activate JDK8 for aaa project"