Temp revert IME switcher to fix build ATM

Change-Id: I30bb027a67be8f9bb4be3b82b7282fd3ded1ec7b