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

Change-Id: I6b0b015f31b910f47209ff399abe45552e8e9856