am 703f4958: merge from open-source master

Merge commit '703f4958c207c575adfa1526725728b96c575649'

* commit '703f4958c207c575adfa1526725728b96c575649':
  update 404'd source.android.com URLs