Merge "Dist com.android.nfc_extras.jar." into gingerbread