Switch to new strings.xml format
Switch to new strings.xml format

This does not result in any change to the app

Change-Id: I9797f0c4fcd0c3cf3064efb39dc1b9a84478cce5

Jigsaw-Code/Intra,Jigsaw-Code/Intra