Merge "Add support for LOCAL_SRC_FILES_<extra> to build_bc_lib.mk."