[automerger skipped] Fix heap overflow in nfa_rw_store_ndef_rx_buf am: f75e4bfe4a am: 170489f6f5
am: 30545c7bc9 -s ours
am skip reason: change_id I712c1af4442dea526a1fb27123eefdb2ac60c830 with SHA1 11d0ac5fea is in history

Change-Id: I40724aff97fafb418c5879f4bdb8ed74c7dbfc89