Merge "Avoid post-reloc GOT usage in __linker_init" am: 5b867699fd
am: 222c07b351

Change-Id: Ib84572951a0c350e764c7344981607f3ed9b5004