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

Change-Id: Ia0352244441cd51a68f4dff437a87507199b5eac