Merge "updates to use new doc toolchain"
authorYujun Zhang <zhang.yujunz@zte.com.cn>
Wed, 10 Aug 2016 14:09:14 +0000 (14:09 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 10 Aug 2016 14:09:14 +0000 (14:09 +0000)

Trivial merge