dont include all subdirs unless this is edison
fix TARGET_RECOVERY_FSTAB define
fix subdir build paths
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2