Merge "Update droiddoc templates for build/make move" into nyc-dev-plus-aosp