Merge "Remove subdirs" am: adf8208c52  -s ours am: 73eaa91e0a  -s ours
am: 1335970727  -s ours

Change-Id: Ied1cdd7d4b91ac37a8b3bb0a8aaaf48a76803042