Merge "Add getter for java.io.FileDescriptor.owner."
am: a219963f97

Change-Id: Ie24776170a9a541376038190826356d609ec65b7