Merge "Move bcinfo headers next to library" am: 488d702e0e am: de28a8087f
am: 3c49fdb8f8

Change-Id: I66f7dc80b0ad7bb1e2bbc2b3b912810753aedec8