Merge changes Ie4709b6e,I57980ccb

* changes:
  com.android.nfc_extras is built with java_sdk_library
  Fix link-type check warning on com.android.nfc_extras