m8: enable idletimer for netd

Change-Id: I692a35debc4329edededb7cff8faef329297e4f1
nfc: pn544: Switch header places and export

PN547 HAL source expects pn544.h in include/linux/nfc/, yet the header
currently there is from an unused driver in drivers/nfc/. Have them
trade places, fixup the includes, and export the header. Also fix the
accursed whitespace while at it.

Change-Id: Iae00e208b1c5d5928a63cc653f72a7d6b06c81e6
Merge branch 'remote' into mkl