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

Change-Id: Ic9d6c12d9afe25587734cc93ca23010af7ef1180