Merge "Fix javadoc error when building SDK"