Merge "Migrate disk directory from /data/system/ to /data/misc/"