am 83aca79b: Merge "Don\'t include static executables when SANITIZE_TARGET=address"

* commit '83aca79b8df3296e24122f3ed9016f1463edb451':
  Don't include static executables when SANITIZE_TARGET=address