Merge "Remove obsolete directories" am: f643b06c5e am: d58b482952
am: 0a3b19660a

Change-Id: I38ce535f4956c7e1dd78e481a7bd8603bf5ea6b5