Merge "Phony module vndk_package is added"