Merge "Update for accurate unreadable elf files." am: 95c777072f am: cf5009d679

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

Change-Id: Ie84e7b2c682314b99ca3fc1bd819512cce65af2d