Merge "Change VNDK snapshot build targets to *_ab" am: d1186ac52e
am: 516ab52389

Change-Id: Iea94fda19ae827896e83b7041f7463b429821707