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

Change-Id: Ib21216a0482569f0b9f790b5894b760aa40b171a