Merge "Remove subdirs" into oc-mr1-dev-plus-aosp