Merge "Update for new bcc build() interface."