Merge "Add an aapt option to allow string variations for different devices." into gingerbread