Move scap files back to /usr

With glance out of the way we should have enough room.

Change-Id: I2d34d5e2c76333fa62f41ce7d35bd00d3f9d012e