tree 12fd385cd8cc7add3ec2eab0fcf2c43e7c700b16
parent f4c5e3646c47a513e3abfa7122b0d614a40badde
parent 48eddb6dca3f894a588d06c91a3e654e61e99d11
author Christopher Ferris <cferris@google.com> 1570728965 -0700
committer android-build-merger <android-build-merger@google.com> 1570728965 -0700

Merge "Add support for scudo." am: 87a10ac108 am: 7b76452fe4 am: 0e0124b68d
am: 48eddb6dca

Change-Id: Iebd2a2ff4f806b608eb776ee3a4afb88cc436aec