Fix bug in SDP 128-bit UUID lookup

Also re-factored the surrounding code slightly to where it would have
prevented this type of bug in the first place...

Change-Id: I7b7ed4459c4f377d97b608bfe2e0c13aac31680e