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

Change-Id: If9470785db792708be1851bda79799efcc87a551