Merge "Reorder STL flags before user specified flags" into studio-1.4-dev