inc: fix storage locations in fstab.inc

Patchset 2: specify partition numbers for /sdcard and /emmc (fixes /emmc
mounting)

Patchset 3: Update partitions to correct internal and external storage
mounting

Change-Id: I224afa321db13a4f9810e1587d49b297995b91bf

Conflicts:
	prebuilt/root/fstab.inc
Merge "inc: fix storage locations in fstab.inc" into jellybean-4.3