Repair local lib conflict w/ external/gson

Change-Id: I11455fe3d4868e36333ba93ef23fec2fe4bc4e4a