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

Change-Id: I6d801fb22dc34b781b7e99bff88cae5fc06acf71