arrays.xml and strings.xml from before the merge...need to be fixed

Change-Id: I638619bc1a8feec3818d40576b2729ff8249f941