Merge "Use target 'vndk' instead of 'vndk_package' while creating abi references."