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

Change-Id: Ida5a4c8d5643bbe1bdd3d1b2f106ce06ba95b334