am c5d06301: merge from open-source master

Merge commit 'c5d06301abe18c3fd709b9b37ad64b8d26ad273c'

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