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

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