Merge "Revert "Fix integer overflow in NDEF_MsgValidate."" into oc-dev am: 9dcb83d4 am: 8a359837 am: 239ff6c7 Change-Id: I02f9f7631de429774b0197bd472a36d5e6d2ab3d