Merge "Add JDK 6 dependency for the ADT plugins"