Fix divergence of VNDK ABI dumps [30/32/x86] am: 2b7869aa4a am: aa338008fd

Change-Id: I1507cd5bbcc22d14afb08b89144b177fd370a2e6
tree: 6de5f5910777bf35e1608497de056dfc96d91be3
  1. 29/
  2. 30/
  3. R/
  4. Android.bp