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

Change-Id: Iee5e75009bfe1dcce9dd021aa20f1410b1810f32