Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread