Merge "Mark functions in headers with static inline" am: 1c9d60cd6f
am: d1d43e6774

Change-Id: Ia19e19b32f0dd250f5c5591c2c6f064eee650309