Replace external/skia path to new repository android_external_skia

Change-Id: I095ece87b847ce38cfa380747712826ceae519e0
Replace packages/apps/Nfc path to new repository android_packages_apps_Nfc

Change-Id: I2434d7bfb4b4e3244da67b576e401969b213109a
Merge remote-tracking branch 'omni/android-4.4' into omni-4.4

Conflicts:
	default.xml