[automerger skipped] Merge "zygote: fix mprotect range for non-page-aligned segments" am: 09c87c5587 am: d5cf7ee795 am: 277e9c9f00 -s ours
am skip reason: Change-Id I6c609e73b59b86c2fd493a8ccf91ccf6c4dc75bf with SHA-1 a9940c2a53 is in history

Change-Id: I2b58e8b27983961352b481b32163d949a3ab9a2f