Merge "Update Eclipse plugin to handle new LocaleQualifier API" into studio-1.2-dev