Merge "Move apache HTTP tests out of tests/net" am: 9447b8caf5 am: bc83be307e am: 317fde6e7b am: 7c9c49a49a

Original change: https://android-review.googlesource.com/c/platform/cts/+/1471587

Change-Id: Ib852b9f12a591ea4e073ff4e6555de796c000f54