4d37927c64
By "Carl Benson" <carl.benson@windriver.com>: I had to do some modifications myself though, because the Android build system insists on having a file named "util.h" taking precedence in its include path, libupnp gets confused because of the same filename in upnp/src/inc/util.h (hand cherry picked from commit 8e846368e0f0e33a5d42bc56b0c6025a8afd5e78)