Merge "Change drm/crypto service names to "default"" into oc-dev
am: 7faba5ea99

Change-Id: I1985809c7fb7fc29614e470a99d2313de6c0d7b8