Android 5.1.1 release 37
Merge "Remove backup file."