am 990d9ca4: merge from open-source master

Merge commit '990d9ca416d1410130333b7b461162c953a1f0c2'

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