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