Fixed bad AutoMarshallingHTTPClient imports

Change-Id: Ib22a1be1c398866e2fa8cf14ca6dc1941c656ec9