Merge "SEAndroid: Allow drmserver access to media files for testing"