Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev