Merge "Remove InputMethodCtsActivity, which isn't used" into sc-dev