Merge "Add METADATA to apache-http: Apache2=NOTICE" am: 8369056b59 am: dc675ca795 am: de098f44a7

Change-Id: Ica5dd227a1aab3b0f900d560b8872c05146fac16