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

Change-Id: I5b78abe4edbdc78e56d6fc7ec66b8e2202eaeadc