Merge "Remove recursive ALWAYS_INLINE" am: 8eec0bb am: 51207ad
am: b00cfef

* commit 'b00cfef007774bb4c1efc64c1605b24c2ffe3d91':
  Remove recursive ALWAYS_INLINE

Change-Id: I526d8c973d3e85f067d429390017db790602aada