Fix divergence of VNDK ABI dumps [30/64/x86_64] am: d14269af53 am: a7672aaee7

Change-Id: Ie72a3d279eb54668c382828b0d50fc69753b783e
tree: f3ebd184cb4398d0efa7bf6276527a2cff4d7b96
  1. 29/
  2. 30/
  3. R/
  4. Android.bp