Make 4.3 work

Squashed set of commits kanged from jf

Change-Id: I2d7488e7ff060f8929f3a5ec8031472a43bafd91
Revert "d2:  Update recovery.fstab"

This reverts commit bb7f67db7b0b85b3d2ad7f02ea958ddac99fc9d5.
Merge remote-tracking branch 'upstream/cm-10.2' into HEAD