Merge "Migrate android.view.inline to android.widget.inline" into rvc-dev