Merge "Move Java classes for HID tests to correct place."