Merge "Android.bp file update for NFC gtest binary"