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

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