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

Change-Id: Icb899cdc587be94aa7af03b560af484206f51abf