Android.mk: Add LS980 to make barrier

Change-Id: I41f60ac9e4f58756c0c14acaf716f838c68cbf3a
SEPolicy: Add /dev/pn544 to file_contexts for LS980

Change-Id: Ice372e75ea5f044b0a802f36c376046a71db1403
Move nfc to device repos, due to LS980 using pn544 instead of bcm2079x

Change-Id: I1ab441fcffadd072707486e0bedb8450a86a42eb
ext4: Disable secure discards

This makes emmc cleanup ops take forever
Merge changes Ice372e75,I41f60ac9 into cm-10.2

* changes:
  SEPolicy: Add /dev/pn544 to file_contexts for LS980
  Android.mk: Add LS980 to make barrier
Merge "Move nfc to device repos, due to LS980 using pn544 instead of bcm2079x" into cm-10.2
Merge branch 'cm-10.2' into martincz