Merge "Do not *directly* package libbcc.so" am: ec0d7cbc49 am: 0cc559f7d8 am: 564a624870
am: bf762321f5

Change-Id: I93ceec4a52dfd5c426f2d37ba49a12b4bfb4b789