Merge "Add droiddoc_template module for templates-sdk" am: b8dad216ff
am: ee2e5d2092

Change-Id: I17aabae0b28cc86b8e9450fa7ee4a58283ea5c57