Merge "GCC 4.4 and later cannot handle h constructs. Fix to replace the assembly constructs."