Merge "vndk-def: Use EnvironmentError in Python 2"
am: 97fe9a48ba

Change-Id: I9f9397c4e433a01c187763974c692f6fa5b782f5