Merge "Refactor the phdr max/min alignment code." into main am: 1a2c4f89ce

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3403239

Change-Id: I353cba2894454dc5d313adfbbc802bc9f8810734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>