Merge "Revert "Fix integer overflow in NDEF_MsgValidate."" into oc-dev