am 202d164d: Merge "Revert "Inline long shift code""

* commit '202d164d97c1e0322188706c222911f8370dd194':
  Revert "Inline long shift code"