Merge "Add METADATA to apache-http: Apache2=NOTICE"