These strings are now global resources, define them accordingly.

Change-Id: Ia68249242850ef3d82cc56ceae7e5ef84dd08b5b
Revert the unwanted submodule change.

Change-Id: I725d89c5c36ce898f7340b270a40d875a13a839c