Merge "Move bcinfo headers next to library"