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

Change-Id: Ia5c36206d3dac074580cda1d3da70d7f0df87953