am a0eb50ac: resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp

* commit 'a0eb50accabe83b18bd3fe3b9d6417a4718af9e2':
  add linker64 and debuggerd64 to all products