Merge "releasetools: Look for recovery.fstab at both locations."