am 4996f119: Merge "Use decltype() instead of typeof()"

* commit '4996f1191cd3d5edf85981d6412aa129da2dcd06':
  Use decltype() instead of typeof()