Merge "Expand the allowed subpaths for test directories." am: 04fd23f7e4 am: 1149bcf590
am: 9c0e0deb80

Change-Id: I2e1df0ae5c6247e41f8a67fd1737979478b19f9c