fix lights 1/2 (sync nypon)
fix lights 2/2 (sync nypon)
update nfc (sync nypon)
fix build
Revert "fix build"

This reverts commit e3ddb6e091ee1486208438f5e9560bd6fef42c1b.
Merge pull request #1 from AndroidOpenSourceXperia/master

Merge with AOSX