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

Change-Id: Ia0c92f59d1d8167a9f734ff576d8914e4e0954af