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

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