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

* commit '51207ad76601961451eb4e9c8c7177edad5eda90':
  Remove recursive ALWAYS_INLINE

Change-Id: Ifb13bfcd32ce2e13e3314592c4b5a3ff8a4573ab