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

* commit 'a565633ff50bdbb355bf3c1a9fed72a39d4514f7':
  Fix up libbcc for LLVM upstream merge to r162314.