Revert "include/uapi/linux/xfrm.h: Fix XFRM_MSG_MAPPING ABI breakage"

This reverts commit 633be494 which is
commit 844f7eaa upstream.

It breaks the Android kernel ABI and if this really needs to be added to
Android, it must come back in a format in the future that does not break
the abi.

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