Merge "vndk-def: Fix `check-dep --check-apk` in Python 2"