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

Change-Id: I9c7af0807d12ef60636d407fbba64ec664a7d31a