Merge "Remove subdirs" into stage-aosp-master