Merge "Replace unused dependency on libmemunreachable"
am: e066f91c0f

Change-Id: Ic12e44e0ad5d7b6979ee7a83337be09ec0ea1c1e