Merge "Add METADATA to tinyxml: zlib+Apache2=NOTICE" am: 17ad4f038f

Change-Id: I91d24e4fd235f42df9792e8b6ca697177b47bc39