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

Change-Id: I4579775a010129de7cb679aaebb9880acfe5d0e1