Merge "Build OmniJaws and OmniStyle" into q10