Merge "Remove subdirs" into oc-mr1-dev-plus-aosp
am: 533c94cb70  -s ours

Change-Id: Ib2a2d593e30e0a8aee11512912a5fecb2b6c7435