Merge "SDK: Fix classpath for eclipse projects."