Android CTS 6.0 Release 4
Merge "Remove backup file."