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

Change-Id: I7903b4cfe8ab6c38903d092f1a10c01f637a0df4