Merge "Make all FrameBuilderTests run on RT" into oc-dev