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

Change-Id: I18f7de85af9038be20ccce3f53e2d5c04118be40