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

Change-Id: I76fa69b2a3e68e3a1df3bf3fe233d84ff4bf4423