Merge "Remove recursive ALWAYS_INLINE"
am: 8eec0bb

* commit '8eec0bbb10dd2909aeb973ee5799e9f736bf3fc3':
  Remove recursive ALWAYS_INLINE

Change-Id: If8312283a79385f37de0b955e0633b3a314b29cd