Merge "fix cannot delete media files in SnapdragonGallery" into android-snapdragonGallery.lnx.2.0