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

Change-Id: If165936d3583141514b64fe88d370760ea4c4739