Merge "Use PC-relative pointer to boot image methods."
am: a17d679235

Change-Id: I148fa7d8b4923478f7f1aabdb5717ab01aa2bf07