Merge "Add paths for DRM  to work with SEAndroid"