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

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