Android 6.0.0 release 2
Merge "Remove backup file."