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

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