This gets us one step closer to removing our dependency on Skia, which is at least one of the things blocking us from moving the input system out of f/b. Change-Id: I755e6267996c93fe700f1056327386923287575a