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

Change-Id: I501695115c2c84345db0c78e8694fd31686b7ee7