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

Change-Id: I5e97f86a9ec78265408c62c2bd7bb974d86d7351