Merge "Add use_bionic_libs macro"