meta-facebook: bletchley: reduce mapper-waits

There is not much value in the mapper-wait invocations since the
providing service is well-known.  Wait directly on the service.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I9be5922229778faedf3cd6b85fba928866583672