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

Change-Id: I06315447c9444963ab9aec102b7d2688165080ab