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

Change-Id: I0434c02f32035b2ced82181587e79c07450adb53