Merge "Add METADATA to tinyxml: zlib+Apache2=NOTICE" am: 17ad4f038f am: 74d07fafdc am: 7644aec2c8

Change-Id: I9ac497680d100210697d8628645c909f1e7132c9