Import ccid-1.4.15 from upstream
Merge branch 'upstream' into android
Import ccid-1.4.16 from upstream
Merge branch 'upstream' into android