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

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