Merge "Fix bugs in tradefed javadoc"