Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread