Merge "vndk-def: Use EnvironmentError in Python 2"