Merge "Update droiddoc templates for build/make move"
am: f8d8458edd

Change-Id: I5b803a789b8695f5f5b8776e634c13c290c91c71