am 2f8ac2a3: Fix build due to merge of duplicate variable.

* commit '2f8ac2a35bbd81cd297d3ea3a1baaa554353e87e':
  Fix build due to merge of duplicate variable.