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