Merge commit '292aefe7d18b6bc7b985c88581f5e486d1b0723e' of sso://googleplex-android/platform/frameworks/compile/libbcc into HEAD
Change-Id: If692c97a596601991c4f67c48b939aa19440cbc0