Merge "For java project to use 1.6."