am 338b3a2f: am 0a40f2d4: am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev

* commit '338b3a2f96e7625a31f9cb38033d3444d450c387':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.