Merge "Use /data/media path when migrating legacy OBB data" am: 88aa295555
am: f2be440895

Change-Id: I65b0151f6583bd7b7fb6e80e81ee79d4bc793228