Revert "HID: core: move Usage Page concatenation to Main item"

This reverts commit 69f67200.

Upstream commit causes issue in report parsing leading to device
registration failure.

Resolved minor compiler error in changing unsigned to unsigned int.

Change-Id: I1491044d67239b6fdb0dd463440e93b979a57b9b
Signed-off-by: Prateek Sood <prsood@codeaurora.org>