Merge "Remove subdirs" into stage-aosp-master
am: 7d7eae9f78  -s ours

Change-Id: I12188088ec976ab6afb7801680949bae80c8a2e7