Misc changes
Remove redundant config_wifi_tcp_buffers

* Already the default

Change-Id: I5192300b2d3393b3d5db781fbd89cb77c4767d2a
Fixup NFC config

Change-Id: I66e95b50ae8e2ea88dcc11faa9927867d838d6af
Enable large heap for Trebuchet

Change-Id: I89da84d33e9c2f64fe95526bf6eb46af8a30b246
Revert "Enable pre-dexopt on userdebug to speed up first boot"

This reverts commit cee2f401406c8d8618a8ceeb4304b6180f00c4bc.