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

Change-Id: I4bfca6d2cb6726bac78fdae0844deeaf22717459