Merge "Sync ART host with device dir structure / add test" am: a3a8662129
am: ace604c7a5

Change-Id: I2eb0b91a1c1751fc8b6d797d8f6c8fe2d6698754