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

This reverts commit 1410277e.

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

Change-Id: Ia1615c1330157de1d7583f60902552b888b95404
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>