am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

* commit '159aa73574804967aded45d06b70df5a8dd64a58':
  Fix build breakage in older branches by avoiding <> notation