Merge "Fix NullPointerException in Bundle#hasFileDescriptors"