Merge changes Ia4a463da,Idefcb584

* changes:
  Remove cts-media-drm-common library and use cts-media-common instead
  CTS : Create common library for split CLs