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

Change-Id: I960366fcca40f86e05929cffa853294dec18a1e7