Merge "Update droiddoc templates for build/make move"