Merge "update 404'd source.android.com URLs"