Android O IOT Preview 6 (4475743)
Merge "Remove obsolete directories"
am: f643b06c5e

Change-Id: Id6074d99aa4d264536d49eaa5b0e6b5ca6375199