Merge "Flatten the libbcc directories."
am: a9dd44f7e6

Change-Id: Ie364fc9e0aef99b9f010c2340e7222f286d67127