Merge "Change drm/crypto service names to "default"" into oc-dev am: 8eb3a1ea59
am: 94c3beecfc

Change-Id: I004d1f2341ebac8b7876128602840772c6223197