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

Change-Id: I32e9c8b78020dcf7e2bf4038637e73e93256fa26