Merge "Add NdefMessage.getByteLength(), and more minor fixes:"