Merge "Mark libraries required by libbcinfo as vendor_available" am: f57105d9a5 am: 9f03d2447a
am: ad8121015c  -s ours

Change-Id: I9e8fe7ce8f693f9a12833f77785742f0933a123f