Merge "Add $ORIGIN to fuzzer-coverage sanitized .so's."
am: a1682631eb

Change-Id: I5748c74b623488b82c94c82ac0a14839f188dc26