Merge "update make target for tradefed javadocs to use correct html templates"