Android 4.3 Release 3.1
Merge "Detect and handle invalid number of FATs"