fix some method declarations

Change-Id: I98a86932433437e6d53b085c5b00b1b8d5ce72b2
fix my Parcelables

Change-Id: Ibbc627457428c8cc3ae91f382603b82c20b689f9
add wifi/nfc/androidbeam check to settings with links to enable

Change-Id: I5be3c552524b807f06d307c623fae4af062fc4fa
use headers for the settings activity

this will give us dual pane on tablets

Change-Id: Ie5681e9e57a4127d86d1665943ad35707e0037d6