Fix divergence of VNDK ABI dumps [30/64/x86_86_64] am: aa0ebe8d74

Change-Id: I3225ce5d2f90a800593f9b1e103d5a333efb3b7e
tree: 9d39cd578d3670651b3f78194ebf4cee01f02912
  1. 29/
  2. 30/
  3. R/
  4. Android.bp