Android 6.0.0 release 25
Merge "Remove backup file."