Merge "Replace droiddoc.custom_template_dir"
am: e04dc3f7ad

Change-Id: I7990a0f1da44ccba6b2475785bf75fb960d47dfa