Merge "Make all FrameBuilderTests run on RT" into oc-dev am: ecc121d8bf
am: 16ee9b9bd1

Change-Id: I1a48d2f483b9d9859b6e5f599e6f59af8cd756c7