Android CTS 6.0 release 6
Merge "Remove backup file."