Merge "Fix number of * in VNDK ABI output." am: eac085dde1 am: 4f88204880
am: b5d3b7aebb

Change-Id: I0c5f2e0c0596853b409ffba6bf6e63e7cf8662e5