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

Change-Id: I0ee8d86236b044aff80a056db6a5084d7a7107a9