Merge two diverged versions of ManifestUtils into test.stubs

Also fixes two DM_DEFAULT_ENCODING warnings.

Change-Id: I16446597c69fdf3f98630e9f5f7d2477b1a55971
3 files changed