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

Change-Id: I650ab11b316e88e71ee610eeac8c855aaa5c8a84