Android 6.0.1 release 45
Merge "Remove backup file."