Merge "i605: unified fstab" into cm-10.2