Merge "Replace droiddoc.custom_template_dir" am: e04dc3f7ad
am: 9c8913b246

Change-Id: I58bf568931841c2581cdb14abd0c736f51dd2885