Merge "Remove activitystrings.xml from localized resource directories"