Merge "Passthrough services: allow -impl*.so"
am: 6cae1a909a

Change-Id: I49ed9dd70ab0cc879bf3b34dd4692e20582a028a