am 46bf467a: am f5f29de6: Merge "Fix bionic linker to support segments with zero p_filesz"

* commit '46bf467a151eafaf37f6e3578d8d9bad705b8e44':
  Fix bionic linker to support segments with zero p_filesz