am 25f97435: am 5fca0efa: am 6cb87b08: am 65fd9811: am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev

# Via Android Git Automerger (4) and others
* commit '25f97435302d8468afeb4ade9f00d5243b393082':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.