Merge commit 'd1a720d06f92a7228f28361a01f3a158c560cd18' into eclair-mr2-plus-aosp * commit 'd1a720d06f92a7228f28361a01f3a158c560cd18': Enable some tests that requires local http server
Merge commit 'd1a720d06f92a7228f28361a01f3a158c560cd18' into eclair-mr2-plus-aosp * commit 'd1a720d06f92a7228f28361a01f3a158c560cd18': Enable some tests that requires local http server