Update for cm-10.2

Change-Id: I6f3a38ab8d654421e7475b55453ed6ff8de570bc
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Revert "Use fstab format for 4.3"

This reverts commit 73a623500b5f266fea94c82320ae4b58a6b425b7.