am a4886f1f: More fixes for internal FAT partitions:

Merge commit 'a4886f1f8ed72e24a302a91a0ab18bc54b6f585e' into gingerbread-plus-aosp

* commit 'a4886f1f8ed72e24a302a91a0ab18bc54b6f585e':
  More fixes for internal FAT partitions: