Merge "Reflect move of mapping file to /system."