Merge "Update droiddoc templates for build/make move" am: f8d8458edd
am: 69c640cb2b  -s ours

Change-Id: I99ce073a3f20b221f6072f63144545d0b00abc1b