Merge "init: don't touch mmap_rnd_compat_bits on 64-bit only builds" am: 2d79c6c0 am: a9f856b1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2154914



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