Merge "Revert "Work around a bug in Immersion's libImmEmulatorJ.so.""