Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev