Merge "don't delete /cache/recovery/last_log on boot" into gingerbread