Merge "Switch to using layoutlib-api-base.iml" into studio-1.3-dev