Merge "Mark functions in headers with static inline" am: 1c9d60cd6f am: d1d43e6774
am: badb70a2cc  -s ours

Change-Id: I1eabc57d8837063a8eefe83e4c3af2f6de88e191