Merge "Expand the allowed subpaths for test directories."
am: 04fd23f7e4

Change-Id: Ib5d1f71def7417f84f3a9c0dbdee4d8dabf3abae