Merge "Mark libbcinfo as VNDK-SP"