Merge "Remove some unused TFTP and DBUS support" am: 00d11a4477 am: c660bc5375
am: 71fa6b0bfb

Change-Id: I7a2c48943d250aa7198a119ba9eaa454d050f291