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

Change-Id: I1c99ad74d9b1ee7e486183b4c62ec732d2d23114