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

Change-Id: Ic3db5168184b31f244fafdd9f05eda463879d2c9