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

Change-Id: I9291bd57f5f68070740bd87816e0543c53479491