Merge "Make libbcinfo buildable for native_bridge"