Merge "Fix the incorrect javadoc links" into stage-aosp-master
am: 727bc71336

Change-Id: Ib7e99be11b1b3061400f0a8a4eecb743ac6a5977