Merge changes from topic "bugfix_content_path"

* changes:
  Add OEM_SOUNDS_DIR variable
  Fix the bug that secondary storage path is judged as internal
  Revert "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"