Merge "Don't generate VNDK phony package"