(Android) Input driver cleanups