Merge "Add libadbd_fs to list of stub dependencies." am: e04eef3242 am: 018990bfe0

Change-Id: I6754282d971a953848641c581954ca298b128929