/data/media handling fix
Merge branch 'nandroid_update'