Merge "Make EditorInfo.internalImeOptions parcelable." into sc-dev