Merge "IOshark support to not pre-create files in /system, /vendor, ..."