Updates to support 3.5 SDK, including removing FBSBJSON related code.