am 475bb357: Merge "Current files for source.android.com"

* commit '475bb357dbab0d1a93e489a8213843ab984ae95f':
  Current files for source.android.com