Merge "Allow toolbox to rm -rf /data/per_boot"