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

Change-Id: Id919a22cfa46071df5e07dedbac59789aff54d49