Revert "UPSTREAM: ehci-hcd: Move include to keep CRC stable"

Revert submission 1437052

Reason for revert: ABI is changed.  While is is correct, we will hold off doing this for another week.

Reverted Changes:
Iae19ae10f:UPSTREAM: ehci-hcd: Move include to keep CRC stabl...
I85a933434:ANDROID: Update android/abi_gki_aarch64.xml

Change-Id: I2859f7b3ffa293371f842c01ecf433a84d5e1179
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>