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

Change-Id: I5a7f4b08ecf4b6ea5b65ad23870f791c40f8b5de