Merge "Use external/apache-http/api/current.txt directly" am: 474f87fea7
am: d973702ed4

Change-Id: I75812a301a8dfb9aa533d7f443ba545166335a65