Android 5.1.1 release 17
Merge "Remove backup file."