am 48f68478: am 8f180b90: Merge "Create userdata.img with real data when SANITIZE_TARGET=address."

* commit '48f68478bd2a375886f30c01b63920575739d9db':
  Create userdata.img with real data when SANITIZE_TARGET=address.