Merge "Add getter for java.io.FileDescriptor.owner." am: a219963f97 am: 84950e8b0a
am: 815a484d33

Change-Id: Ifb57e086e350366c3debbb33d5672dfea4d12736