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

Change-Id: I942fa45af11ff966c41fd61482dde34e5828cc36