Merge "Normalize output from aapt d xmltree"

diff --combined XMLNode.cpp
index 0dba9503f4f0d981cb2f066d197c0ef14130148d,fbb43020ad52814e9b0a95f096e1ea4ff1699574..dcbe7db7c54cbf3d23a2b5844edc49e73fc1079e
--- 1/XMLNode.cpp
--- 2/XMLNode.cpp
+++ b/XMLNode.cpp
@@@ -511,7 -511,8 +511,8 @@@ void printXMLBlock(ResXMLTree* block
              namespaces.pop();
          } else if (code == ResXMLTree::TEXT) {
              size_t len;
-             printf("%sC: \"%s\"\n", prefix.string(), String8(block->getText(&len)).string());
+             printf("%sC: \"%s\"\n", prefix.string(),
+                     ResTable::normalizeForOutput(String8(block->getText(&len)).string()).string());
          }
      }
  
@@@ -973,7 -974,7 +974,7 @@@ status_t XMLNode::assignResourceIds(con
  status_t XMLNode::flatten(const sp<AaptFile>& dest,
          bool stripComments, bool stripRawValues) const
  {
 -    StringPool strings = StringPool(false, mUTF8);
 +    StringPool strings(mUTF8);
      Vector<uint32_t> resids;
      
      // First collect just the strings for attribute names that have a