Bug: 122855168 Test: rebuild Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
Also move some files Change-Id: I4636fcd81425991acadede0b703e09513c82543c Fixes: 113374067 Test: robotests