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

Change-Id: I10805e548cd9bb885f596bdcdf4549c5205f1eac