Merge "Change VNDK snapshot build targets to *_ab"