am ca96fee2: Merge "Don\'t factor out make variables that are only used once for the host."

* commit 'ca96fee299d32bee36d0d35ab02df70c81301736':
  Don't factor out make variables that are only used once for the host.