Merge "Fix VNDK-Ext ABI check regression"