* changes: Apply snapshot variant to vndk package module name Additionally package TARGET_2ND_ARCH variants