This reverts commit 9e7a1c9824cffca32fd7d58bb13bd3416ab32091. Seems that that CL causes ArrayIndexOutOfBoundsException when initializing InputMethodManagerService, which results in an infinite boot animation. Bug: 27129703 Bug: 27348943 Change-Id: I474a87876670ac018c675ac7b4608e90fbb2434b