Merge "Fix header file to always inline stub functions."