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