Merge "Refactor Bundle for thread-safety of Bundle.hasFileDescriptors()"