Merge "Remove LoadString/Class kind kBootImageLinkTimeAddress."
am: d1c22768e7

Change-Id: I184ede1672d5d0bf474ebeec02135aa5bb0c7fd3