Merge "Allow sdcardfs:file read access on mediaextractor"