Merge "Flatten the libbcc directories." am: a9dd44f7e6 am: ac6d20c03c
am: dc4d4f7f1a

Change-Id: I18c60bfb50cc01274a38ac57e5c8752b211e8f31