Switch GsiService to Splitfiemap. am: 563e29aded am: 7676ebc5e7
am: 677644720c

Change-Id: Id7e32ee2009c7485131b34bccea6ae3f8a3e789f