Android 5.1.0 release 4
Merge "Remove backup file."