am 17ff437b: am 49c595d7: Merge "Set correct size of PT_PHDR ELF segment."

* commit '17ff437b2596e4bc4098b75a54fc0bd87f9d7769':
  Set correct size of PT_PHDR ELF segment.