Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97 am: 2086faacd7 am: 34c27d23bc am: ba465eb61f am: cd250914f4

Change-Id: If45358be3978ae64fabdef0805facccfc5627f7c