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

Change-Id: Ic59393606008b5d7511950e929dda71195f4b51e