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

Change-Id: I6877eefd07a821e73ff180fcceeaae398f108a42