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

Change-Id: Ibdf5675e870408f881a1d8ba61b400a8c091b296