Android.mk: Add LS980 to make barrier

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

Change-Id: I1ab441fcffadd072707486e0bedb8450a86a42eb
Merge "Android.mk: Add LS980 to make barrier" into cm-11.0
Merge "Move nfc to device repos, due to LS980 using pn544 instead of bcm2079x" into cm-11.0
Merge branch 'cm-11.0' into martincz