i've merged the CLs back in by hand and rewrote the commits in the process.  i squashed a few CLs like:
 - typo fixes for earlier CLs
 - changes only to Android.mk and related files (so our copy doesn't have any of those)

i left in BRILLO/ANDROID defines and binder support.  it wasn't clean to remove, and not entirely sure it's a good idea in this case.

give it a sanity check before i push it ?
https://chromium.googlesource.com/chromiumos/platform2/+log/sandbox/vapier/webservd

Thanks, looks fine to me.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/97f9b409dfe2bd5fe7954ef159a7943b12cac2ea

commit 97f9b409dfe2bd5fe7954ef159a7943b12cac2ea
Author: Mike Frysinger <vapier@chromium.org>
Date: Tue Nov 28 20:40:02 2017

webserver: move back to platform2

We aren't getting this from AOSP anymore.

BUG= chromium:788227 
TEST=precq passes

Change-Id: I86a5f8638041e1aaa8b20ca53fbbc68b7d65fbbd
Reviewed-on: https://chromium-review.googlesource.com/793982
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

[modify] https://crrev.com/97f9b409dfe2bd5fe7954ef159a7943b12cac2ea/chromeos-base/webserver/webserver-9999.ebuild

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/6f4ec21754b3e9452d50169da9df7e62dc6965bd

commit 6f4ec21754b3e9452d50169da9df7e62dc6965bd
Author: Mike Frysinger <vapier@chromium.org>
Date: Tue Nov 28 23:44:20 2017

webserver: convert to README.md

BUG= chromium:788227 
TEST=preupload is happy

Change-Id: I58730b5b4915613e9d402801d71e98fbb15eb306
Reviewed-on: https://chromium-review.googlesource.com/794040
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>

[delete] https://crrev.com/154a5231cf7749a253e7922ed31ef746cc259512/webserver/README
[add] https://crrev.com/6f4ec21754b3e9452d50169da9df7e62dc6965bd/webserver/README.md
[modify] https://crrev.com/6f4ec21754b3e9452d50169da9df7e62dc6965bd/README.md

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/manifest/+/567d7903c17e52825b745a0156da9c94a6974da5

commit 567d7903c17e52825b745a0156da9c94a6974da5
Author: Mike Frysinger <vapier@chromium.org>
Date: Wed Nov 29 06:27:30 2017

webserver: move back to platform2

We aren't getting this from AOSP anymore.

BUG= chromium:788227 
TEST=precq passes

Change-Id: I8a40f0474efb1f62c6e20e82fc10bce7a4ceb7c8
Reviewed-on: https://chromium-review.googlesource.com/788456
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>

[modify] https://crrev.com/567d7903c17e52825b745a0156da9c94a6974da5/full.xml

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chromeos/manifest-internal/+/3a34e035e4cc0e674a98f51bf52b99d4b71b4409

commit 3a34e035e4cc0e674a98f51bf52b99d4b71b4409
Author: Mike Frysinger <vapier@chromium.org>
Date: Wed Nov 29 08:50:37 2017