Move files around

Change-Id: I2974ce0d9218c2fba04581ae041664b5fb992b0c
Merge github.com-beidl:beidl/droid-hal-device into HEAD