Merge "vndk-def: Fix 32-bit directory layout regression"