Merge "switch all droiddoc builds to use templates-sdk from doclava"