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

Change-Id: I0edee6f4b0a58457435e0cb9f4e7a03fc74aef8a