Merge "Include tests directories in the linker legacy configuration." am: d503239292
am: 5481e3aec8

Change-Id: Ibcf0756e8361521a9dc94d4da7ab625387814e7e