reconcile kltevzw w/ cm -- prebuilt (but working) nfc is fine by me

Change-Id: I4621183810339c34e03f0bdeaad609574e974e49
klte-common reconcile w/ cm

Change-Id: I0b6d36b1a56d703e548a577a33ebb28ec3f24e56