Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE." am: 22ff8e1909
am: b90db0840a

Change-Id: Ia15a78ca5c818e820309e8ab75512e3dc5f48205