Merge "remove deprecated bp 'subdirs'" am: aba02dbe6e am: 22197eaea7

Change-Id: I1fa6f86992ac255469fc6958b7d7ef0659b0c8f7