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

Change-Id: I98ce5c81e75426192329c4fdc06d89729a40f819