am 8215de78: am e2a6258c: Merge "A tiny http server to test source.android.com changes"

* commit '8215de789a5678f67bc5fc4af062b151263eabdd':
  A tiny http server to test source.android.com changes