Merge "Fix up libbcc for LLVM upstream merge to r162314." into jb-mr1-dev