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

Change-Id: Id3aef55bcadd801b52f296880a8a13ca173da799