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

Change-Id: Ibebab4ec0f4948c015e697050d121046cdf5ab42