Merge "Build tradefed javadocs using devsite templates. Use new Doclava template options. Keeps prior doc build target, to be removed later. Fix javadoc comments to build without error."