Merge "Migrate android.view.inline to android.widget.inline" into rvc-dev am: 5a3a3f22 am: c47f8abf am: c70f5e62 Change-Id: I80b8326ad3a11fd2071ed23cb37fb5f79b2635c5