Merge "Mark libbcinfo as VNDK-SP" am: bd81d39847 am: 4855f0b2e8
am: 5326d50405  -s ours

Change-Id: I78273c8427dece5a419c7fca245a0afc0f1ce71c